//
//  ViewController.m
//  TestGit
//
//  Created by 梁辉 on 15/11/24.
//  Copyright © 2015年 梁辉. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
<<<<<<< HEAD
    self.view.backgroundColor = [UIColor whiteColor];
    NSLog(@"123");
=======
    NSLog(@"哈哈");
>>>>>>> ce43412fac9f8e12fa08d754da181b99394be6f5
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
